More things done and Mono upgrade