Fixed brackets problem; v1.2 is now stable

Reorganized too