Update docblocks, remove close php tag, add getUserId() method

and some commits