bug fixes
placeholder stuff