Dev

Minor fixes, updates & code refactoring