use constants
cleanup comments / use @Override
update comment
fix warning
update todo
more todo's