some fixes
some cool things