floobits, fixed ls
merged