additions and cleanup

Signed-off-by: Josh Lawrence <josh.lawrence@dmpinvestments.net>