cleanups and check things over, no bugs found
add the labels some to better reflect reality