Some style & other bugs fixed