Fixed a few basic things