updated to reflect api changes
updated some more... removed stuff thats not needed atm.