Bug fix and polishing