Add more handlers, cleanup