carlosf bugs have been corrected