Add more handlers, fix status, and more bug-fixes.