3+4 finished + fixes