A lot of bugs fixed. Some changes to create secret module. :)