fixed some overlooked stuff