Committing last changes

This branch will be dead for a while