Bug fixes, new methods