Started fixing errors