small changes/ bug fixes