some fixes and feature

New generated system
fixed borders