Bug fixes, polishing