Some bugs fixed, some moduls added