4c done + fixes