fixed few variables