Loads of fixes for Project Skyfire & clean ups.