Raft of updates and bugfixes