fixed both bugs, should be good to go