* merged it also and fixed lots of stuff by hand