minor refactoring and commit prior to pull
fixed merge errors
started on handleSuggestion
minor changes