added some attempts at fixing the geometry issue, fixed particle initialization