initial
fixing errors