Add final fixes and modifications