small bug fixes, string changes