Fixed the couple bugs that I found, ready for implementing :D