giving up on tags
adding little fixes