Adds some fixes and changes