Fixed crash when not signed in
Merged _comment conflice
Added foreign key associations