fixed bug in REST, lots of cleaning, more forms entries