Aligned array
CS fixes
Merge pull request #176 from GrahamCampbell/prefixes-cs

Prefixes CS Fixes