bug fixin
console loggin
fixed?
fixed?
hack fix?