Fixed integer switches and cleaned up a little.