Fixed several minor bugs, added separate calculation displays for each data window