Added many small updates