Minor fixes, expose rescan function for use

Still have to write documentation and provide examples