Lot's of tweaks in syntaxis

Basically NOW it should work properly :)