Fixed bugs
big try-catch
Lint