pos fix & general update
pos fix