fixed alot of issues.
Need more work on GUI