more changes, still broken

fixed some issues, but there are others.