Bug fixes, improved 'x'