Final Fixes Part 1

more to come..?