Added the rest from floobits.
Conflicts from floobits fixed