fixed small (but annoying) bugs