Fixed Final issues

I belive this mod is DONE :D