added many small things