Mbornoz changes

Multiple changes by @mbornoz