loooots of errors

declarations changed, everything else needs to be updated to match that.