Various bug fixes, file renames,  and tweaks to hopefully make it work.