some fixes and stuff..