cleaned up some stuff and added width/height options