fixed history increment; added magic-space