small changes made and few bugfixes added