Filled in returns and fixed return types