Fixes, syntax improvements + misc