- Fixed some stability isssues
 - Refactoring