reindent, finishing touches on redesign