-Fixed some problems
-Some features still missing, will have to know how to put all the functions