Add -g to help debugging
Fix desktop includes
Format fixes
Add support for DIM (simple arrays)