Fixes and stuff and.. fixes...