Major update, bug fixes, changes