Fixed things

Fixed many things, trying to decouple lot of unneccessary thigns