Added some more

Feel free to modify as you see fit.