Bug fix and some little adds