bugfixes and properties as of now, only temporary, should be refactored
and put in one or two properties