1.3

lots of changes