Fixing some errors
Draft 1.2