Misc. Fixes

A bunch more bug fixes. Locations and most forms should eb working now.