Updates, cleanup, commenting