Various bugfixes and polish
Also, hooked together some functions we never got around to hooking together