Lot of fixes + Added Dev commands.