More changes and fix constructor bug

Added font2