started uniform system and updated a few classes