Fixed names and added my own :P