fixed heaps of stuff working good now
speed up and cleaned