Fixed bugs, etc..