style improvements
Minor bug fixes