Issues bulk update

Added few specs and cleanup a bit.