All changes from the moment I forked

no comment needed