Few more changes. Logical errors. Logical errors EVERYWHERE ;)