small fixes, griffin writes fast, sceptar writes slow