Changed a few basic things around