removed junk and final issue tweaks