Add base (zip file). Small bugs fixed.