bug fixes
some last tweaks
merged conflict yo