Clean up base case
Fix some more