-Fixed some problems
-Still not working well... lot to do