removed comments
bug fixes