Form fixed, added libs