Committed and fixed issues from @cx