Fixed bugs, final version