basic updates, but still needs cleaning up