fixed some minor inconsitencies