Proposed fixes

This pr fixes some of the mayor problems discussed in the last reunion.