Cleaning
Minor bug fixes