added more week2 things, prettified the calculator