Fixing some issues. Making project more stable.