Fixed bugs, updated Important Notes