More Fixes.
Numerous Fixes.
More stuff.
Merge branch 'feature/Starlingify' into development