cleaned up output and added TODO for future features