Bug fixes and introductions