some fixes and changes that doesn't matter
stuff