various updates
Merge branch 'phoenix' of github.com:InvictusInnovations/fc into phoenix