cleanup, additions