Code

fix 2 bugs