Fixes and additions according to review