Numerous feature additions and changes