Added more handlers and fixed some bugs