Fixed some bugs and finished the rest
fixed silly conflict