fix never bust with ace bug
tidy
better comments