added more features to homework