Added a few more things, nothing too much