Revert "Small fixes and change for easy adding"

This reverts commit d95addcf479a372e8245b6df725d2cf1156e7012.