Added random user functionality, cleaned up errors