Basic forms and some fixes