Finished some main features