minor
comments, optimisations, fixes
comments, optimisations, fixes