Bug fixes

Running skeleton