lots of small changes
hehe