removed more pointless code, cleaned up bits
updated contribs