Added river classes, updated car init