bug fixes, frontend fixes