Minor code improvements and added latest build