Etended testing and bug fixes