fix return
fixed one liner
fix format
Merge remote-tracking branch 'origin/isaac'
these changes got erased
updated db base and formatting