Fixed import bug
Tweaked constants a bit