Fixed Bugs, added new customizations