added collision and map parse