Fixed small functionality issues and added data processing