- changed order of module dependences as stated in Firebug Coding Style
- fixed some errors introduced with last commit