little bits todo
update
no idea
merged theirs