forgot to commit some edits and improvements