update, add lotz of stuff...