Some small updates... enjoy