fixed history bug and change constants to non-debug values