clean up, fixed errors in core files. all systems go!