euhm. Failed a bit, fixed some more errors now