Many more tweaks and fixes

Getting real close to finishing this project... Very exciting