Cleaned up output a bit and added a couple functions