fixed a few magic values