some comments and removed a dirty fix