Bug fixes and fun new methods!