some stuff
attempted bugfix
merged