bugfix
duh
more dur
more fixes