fixes and polishing