Fixes from code and gui review
merge