ass
commitment marks, clean up js