Clean up import, fixed build-options and added typesignatures