General fix-ups and added Celluloid