more changes.  stuff still broken though