Comments and Fixes

Signed-off-by: Enrique Chavez <noone@tmeister.net>