Fixed bugs, updated graphics