Fixed many many things...