some fixed today :)