Bug fixes, additions