fix variables n stuff