removed junk and made small improvements