Bug fixes, etc
Made things faster