Removed file
Added some handlers, fixed some bugs