bugs
minor changes