v8.0.04 Final Commit

Minor interface tweaks