various tweaks and updates, nearing completion of functionality