Fixed bug in testing
Removed redundant include
Updated some comments
Added explanation for alignment modes