recommented some pieces, cleanup