lots of changes

hard to describe, but i've added and modified a lot since the last
update ;)