Cleaned up, added new build tasks