comments (to do's) / bug fixing