Update 3

-Possibly fixed solved check
-Now testing an cleaning up code