added preliminary stuff and fixed some issues.