Added borders, improved physics