fixed some bugs, hopfuly, and added some goodies