pretty bold update, may break stuff but it fixes..

..fixes more problems and worth it.