Cleaned a bit up, still WIP with no time to customize!