Fixes, not all finished