fixed form issues WIP