Bug fixes/improved functionality