Dev merge

changes to be tested with the upcoming release of Ironfan!