misc updates, main commit waiting for bugfix