fixed more erors