Fixed various items
minor changes
minor changes