Rev #2

Bug fixes