fixes and other bugs removed.