Fixed errors
Removed display stuff