Fixed bugs
Fixed bugs and added config things