Added rendering methods, few bugs and totaly messed up the code...