bunch of changes, fixes
production