Bug fixes, hopefully handlers both work at this point.