added some style changes and bug fixes