some fixes, some new shit