working on more features and fixed form