some random fixes to fulfill the assignment objectives