some fixes for android + comments