minor edits
Fix remaining eclipse errors and warnings.