tweaking model, still needs a ton of work; minor changes here and there