updated some methods. removed some try-catch-finally issues