Added lots of things, this is the last update for the first version!