Updates

Closes #13 
Closes #16 
I'd say either make this an `else-if`, or return in the previous `if` block.