small bug fixes and code cleaning