re-adjust positioning a little, code mechanically sound now