fixed bug

there was an issue with getting the correct values for everything so I
had to add get methods and change some stuff so it wouldn't break
anymore