Final Build v5. Fixed some small bugs