Zeljko fix + some minor changes