- refactored a bit.

- added re-answer ability to proposals