yeah yeah fixed a bunch of bugs stuff like that, optimized code a bit
credits to naafiul for creating original project, +he can use modified code here if he wants
