Already found a couple of bugs and fixed them