more tweaks

Changes, syntax check, etc