comments and bug fixing