DanMossDev Bugfixes and polish round 2