Fixed error with upper border of random
Added wrapper for Console