Bugs fixed, things generally work now.