Closed #72, closed #73

Note: update manager still has to be tested, though there shouldn't be
bugs