Fixed all errors with all of shruti's code