comments added/bug fix/file remove