fixed maps and added custom styles. Cleaned up some model code