fixed stuff and build