Issue #18 resolved, #7 partially (suggestions not implemented)