oooh nice
some fixes