cleaned up a ton of stuff...fully working now