fixed some bugs and added some customizability