repairing a bunch of botched commits
fixing some config stuff and requirements