Småting ang id == null
resten af filerne
Refactoring and small corrections
Merge db