some cleanup...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
more cleanup...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
fixed a biggish align bug...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
fixed a couple of bugs in manual sorting...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
updated todo...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>