Finalizing some stuff for BETA

Took out the bunny ranch untill fixed / enhanced