Good updates, still needs a few more touches