More fixes, added support for long types, implementing dependency management now