fix compilation errors, forms still not correctly implemented