Some bugs, just saving code