small bug fixes needed after testing