took care of a few //todos
took care of a few //todos