bug fixes, csrf issue resolved