v1.3

simpler, bug-free-er