Fixes some errors + more selective proposals