Fixing bugs and adding features.