mods

I made some changes, please review.