Revert "fixed a couple issues"

This reverts commit 3008eb5ace2a7752707f65e145dbe533c615c67e.