updated some stuff
merged with what i had at github.com