fix bugs, add commentary