code changes

getting prepared for major overhall