Fixed bugs, etc.