Just a few minor bugs left