minor touchups, i'll work on this tmrw