Added you as reviewer. I already made several fixes but where will be even more fixes when we get next version. Please test your changes in application to see those in real context.