Fixed bugs, begin on new sign system