Small details and Bug fixes