Regarding #38 #39:

-Fixes to authorize() in Model.java