Cleaned up and added randoms and content checkers

ect.