fixes based on kottans feedback