Lots of fixes, 3/4 working.