Corrected some parsing conflicts + better dependencies