Fixed bugs, updated manual