major updates that I should have been committing all along...