misc minor cleanups
massive refactor of completion proposals + fix #353