Added custom cards file , fixed bugs, cleaned up code