Cont. update...

Full update from previous commit since some files weren't saved yet.