fixes some erors
added excluded files
resolved merge issues