fixed lots of issues, incorporated trader store