New updates.. small fixes