refatoring stuf
made it more friendly
fixed things