added a lot more stuff, don't really remember what I did