finally mostly working right
fixed some issues, created some others