removed bad code
fixed some stuf