Lots of bug fixes - only the status controller does not work right now.