Fixed some varibel that had hardcoded values