added border, renamed viewport, added Vector