Fix comments and add basic features