Added Text and fixed misc bugs