Fixes to AGLSL mapping plus housekeeping