Added pauses and minor improvments