Updates for issues 13(complete) and 11(partial)