forgot to include another file and additional improvements to the previous commit, including improved tofront/back behavior (apart from lingering bugs)