Updates, bug fixes and new features

tbc.