b.2.4.4 Fixed all the things.

- Fixed all from 2.4.1 till now.