Revert "fixing a few things"

This reverts commit 4cf9e159f4f14fe3ff8b5994ec35865c2410a6fb.
Revert "changing a few things here and there"

This reverts commit 8edc34e089c8895d55364156274b8f89bc1ed150.