Fixes and improvments.