couple of fixes
it wasn't returning anything