few changes

updated some code etc, still working on it