added broken functions, count maps, etc.;
Merge branch 'master' of http://www.github.com/m4b/octo-wight