Ymse fixes + userpage.html
mm
fixed pull