some more packages + clean up