yes! both of those! Thanks again for your fantastic contribution - it was displayed on it's own screen in the tower and was a great addition!