fixed a feature that made me make the same mistake three times...

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

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