little bubble and some fixes