cleaned up patterns a little, changed them up to be more usable