Added some minor stuff